Do not initialize the priv pointer before check type

diff --git a/gtk/gtkhsv.c b/gtk/gtkhsv.c
index 78be5921caea721a71dc9829ad7d01ce778fadc9..cc01373c49cb20653b81c63c665eb2af3c36408e 100644 (file)
--- a/gtk/gtkhsv.c
+++ b/gtk/gtkhsv.c
@@ -1360,18 +1360,18 @@ gtk_hsv_get_color (GtkHSV *hsv,
                    double *s,
                    double *v)
 {
-  GtkHSVPrivate *priv = hsv->priv;
+  GtkHSVPrivate *priv;
 
   g_return_if_fail (GTK_IS_HSV (hsv));
 
   priv = hsv->priv;
-  
+
   if (h)
     *h = priv->h;
-  
+
   if (s)
     *s = priv->s;
-  
+
   if (v)
     *v = priv->v;
 }
@@ -1391,7 +1391,7 @@ gtk_hsv_set_metrics (GtkHSV *hsv,
                      gint    size,
                      gint    ring_width)
 {
-  GtkHSVPrivate *priv = hsv->priv;
+  GtkHSVPrivate *priv;
   int same_size;
 
   g_return_if_fail (GTK_IS_HSV (hsv));
@@ -1402,7 +1402,7 @@ gtk_hsv_set_metrics (GtkHSV *hsv,
   priv = hsv->priv;
 
   same_size = (priv->size == size);
-  
+
   priv->size = size;
   priv->ring_width = ring_width;
   
@@ -1427,7 +1427,7 @@ gtk_hsv_get_metrics (GtkHSV *hsv,
                      gint   *size,
                      gint   *ring_width)
 {
-  GtkHSVPrivate *priv = hsv->priv;
+  GtkHSVPrivate *priv;
 
   g_return_if_fail (GTK_IS_HSV (hsv));
 
@@ -1458,7 +1458,7 @@ gtk_hsv_get_metrics (GtkHSV *hsv,
 gboolean
 gtk_hsv_is_adjusting (GtkHSV *hsv)
 {
-  GtkHSVPrivate *priv = hsv->priv;
+  GtkHSVPrivate *priv;
 
   g_return_val_if_fail (GTK_IS_HSV (hsv), FALSE);
 

diff --git a/gtk/gtklabel.c b/gtk/gtklabel.c
index 313da1909303926b0b8d9a1a042d4f00bcf478f4..0b7ee8833235b8391f193fb5aa8cd15b389fd246 100644 (file)
--- a/gtk/gtklabel.c
+++ b/gtk/gtklabel.c
@@ -2820,7 +2820,7 @@ void
 gtk_label_set_pattern (GtkLabel           *label,
                       const gchar *pattern)
 {
-  GtkLabelPrivate *priv = label->priv;
+  GtkLabelPrivate *priv;
 
   g_return_if_fail (GTK_IS_LABEL (label));
 

diff --git a/gtk/gtkliststore.c b/gtk/gtkliststore.c
index 1844a8bbcf10325998b527e734c77da475003b75..b6533e4d80d9838e5819f372318b8323340e37f5 100644 (file)
--- a/gtk/gtkliststore.c
+++ b/gtk/gtkliststore.c
@@ -939,7 +939,7 @@ gtk_list_store_set_value (GtkListStore *list_store,
                          gint          column,
                          GValue       *value)
 {
-  GtkListStorePrivate *priv = list_store->priv;
+  GtkListStorePrivate *priv;
 
   g_return_if_fail (GTK_IS_LIST_STORE (list_store));
   g_return_if_fail (iter_is_valid (iter, list_store));

diff --git a/gtk/gtktable.c b/gtk/gtktable.c
index ab8c826e523960b3f3da5a381e15d2a5ce8a4ead..dee3d34b09e392761a1571eacc8cc01669a315c5 100644 (file)
--- a/gtk/gtktable.c
+++ b/gtk/gtktable.c
@@ -750,9 +750,9 @@ gtk_table_attach (GtkTable    *table,
                  guint            xpadding,
                  guint            ypadding)
 {
-  GtkTablePrivate *priv = table->priv;
+  GtkTablePrivate *priv;
   GtkTableChild *table_child;
-  
+
   g_return_if_fail (GTK_IS_TABLE (table));
   g_return_if_fail (GTK_IS_WIDGET (child));
   g_return_if_fail (gtk_widget_get_parent (child) == NULL);